From 1d6c6fc3b8fcdae9d73976687297935273bf0cec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Thu, 19 Nov 2020 16:27:48 +0100 Subject: [PATCH] shortcutcontroller: Separate trigger/action early returns We take this early return in update_accel over 36k times when starting the widget factory and always because the action is not a named action. --- gtk/gtkshortcutcontroller.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk/gtkshortcutcontroller.c b/gtk/gtkshortcutcontroller.c index 0c7922f5ec..72f777d386 100644 --- a/gtk/gtkshortcutcontroller.c +++ b/gtk/gtkshortcutcontroller.c @@ -461,11 +461,12 @@ update_accel (GtkShortcut *shortcut, if (!muxer) return; - trigger = gtk_shortcut_get_trigger (shortcut); action = gtk_shortcut_get_action (shortcut); + if (!GTK_IS_NAMED_ACTION (action)) + return; - if (!GTK_IS_NAMED_ACTION (action) || - !GTK_IS_KEYVAL_TRIGGER (trigger)) + trigger = gtk_shortcut_get_trigger (shortcut); + if (!GTK_IS_KEYVAL_TRIGGER (trigger)) return; target = gtk_shortcut_get_arguments (shortcut); -- 2.30.2